accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [11/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Date Fri, 21 Feb 2014 22:21:21 GMT
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	CHANGES


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/63958404
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/63958404
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/63958404

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6395840418046d8b3a923a4bfb3e4ba486c5dcd0
Parents: ce1d965 a38b004
Author: Josh Elser <elserj@apache.org>
Authored: Fri Feb 21 14:20:49 2014 -0800
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Feb 21 14:20:49 2014 -0800

----------------------------------------------------------------------
 CHANGES | 12 ++++++++++++
 1 file changed, 12 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/63958404/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 644cf07,5232a02..5d15bed
--- a/CHANGES
+++ b/CHANGES
@@@ -14,8 -14,12 +14,12 @@@
    See the License for the specific language governing permissions and
    limitations under the License.
  -->
+ 
+ 
 -Release Notes - Accumulo - Version 1.5.1
 +Release Notes - Accumulo - Version 1.6.0
  
+ 
+ 
  ** Sub-task
      * [ACCUMULO-1520] - Misc functional test fixes
      * [ACCUMULO-1688] - Ensure ZooLock.watchParent is properly set in case of Connection
loss


Mime
View raw message