summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java
Commit message (Expand)AuthorAgeFilesLines
* Merging from trunk r1618840:1619054 in the Java treeRobert Godfrey2014-08-251-6/+8
* Merging from trunk r1618473:1618815 in the Java treeRobert Godfrey2014-08-251-0/+164