[1/2] git commit: ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093

2014-01-06 Thread ctubbsii
Updated Branches: refs/heads/master 4fbba38ae -> 33a094de4 ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea8fe541 Tree: http://git-wip-us.apache.org/repos/asf/accum

git commit: ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093

2014-01-06 Thread ctubbsii
Updated Branches: refs/heads/1.6.0-SNAPSHOT 9c092cadd -> ea8fe5414 ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea8fe541 Tree: http://git-wip-us.apache.org/repos/a