[1/5] phoenix git commit: PHOENIX-1402 Don't recalculate stats on split

2014-11-06 Thread jamestaylor
Repository: phoenix Updated Branches: refs/heads/3.2 2ec907f73 -> 40ecd8590 PHOENIX-1402 Don't recalculate stats on split Conflicts: phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java phoenix-core/src/main/java/org/apache/phoenix/i

[1/5] phoenix git commit: PHOENIX-1402 Don't recalculate stats on split

2014-11-06 Thread jamestaylor
Repository: phoenix Updated Branches: refs/heads/3.0 d2cd2856b -> 84f634325 PHOENIX-1402 Don't recalculate stats on split Conflicts: phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java phoenix-core/src/main/java/org/apache/phoenix/i