*            the persistence unit
     * @param puProperties
     */
<<<<<<< HEAD
    public HBaseClient(IndexManager indexManager, HBaseConfiguration conf, HTablePool hTablePool, EntityReader reader,
            String persistenceUnit, Map externalProperties, ClientMetadata clientMetadata,
=======
    public HBaseClient(IndexManager indexManager, Configuration conf, HTablePool hTablePool, EntityReader reader,
            String persistenceUnit, Map puProperties, ClientMetadata clientMetadata,
>>>>>>> 4629bf49dd73b835c98894f9d16c609b2755ac15
            final KunderaMetadata kunderaMetadata)
    {
        super(kunderaMetadata, externalProperties, persistenceUnit);

     *            the persistence unit
     * @param puProperties
     */
public HBaseClient(IndexManager indexManager, Configuration conf, HTablePool hTablePool, EntityReader reader,

             String persistenceUnit, Map externalProperties, ClientMetadata clientMetadata,

             final KunderaMetadata kunderaMetadata)
    {
        super(kunderaMetadata, externalProperties, persistenceUnit);