ACCUMULO-1267 record only merge from 1.4 onto 1.5


git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1499201 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 fix compile error

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1500063 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1552 applying Jonathan Hsieh's patch to fix the typo

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1500719 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1552 applying Jonathan Hsieh's patch to fix the typo

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1500723 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1557 applying Jonathan Hsieh's patch

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1500878 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1557 applying Jonathan Hsieh's patch

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1500880 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1561 updating rpm-maven-plugin version

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1501024 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 completed the conversion of functional tests to IT; also converted ShellServerTest to an IT

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1501497 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 moved integration tests to test/src/test; added more timeouts to tests

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1501750 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 improved timing/reliablity of tests

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1501860 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 fix race condition for scan timeouts

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1501884 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 - Adding apache header



git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1501951 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 put IT output into files, make java programs identifiable using "ps"

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502278 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 increase timeouts for build server

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502296 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-998 applying Micheal Allen's updated patch for at-rest encryption

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502316 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 increase timeouts, fix TableIT

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502336 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 fix static cluster/folder in MacTest

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502343 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1537 fixed NPE in MAC

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502381 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1564 Fixing types (JWDP -> JDWP)


git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502407 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1563 committing Jonathan Hsieh's patch to prevent the test from writing to /

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1502584 13f79535-47bb-0310-9956-ffa450edef68