[jackrabbit-filevault] branch JCRVLT-684 updated (6b25622d -> 1492862c)

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a change to branch JCRVLT-684
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git


    from 6b25622d Merge remote-tracking branch 'origin/master' into JCRVLT-684
     add 1492862c JCRVLT-684: restructure test packages

No new revisions were added by this update.

Summary of changes:
 .../apache/jackrabbit/vault/packaging/integration/NodeStashingIT.java | 4 ++--
 .../{stashing.zip => stashing/create.zip}/META-INF/vault/filter.xml   | 0
 .../create.zip}/META-INF/vault/nodetypes.cnd                          | 0
 .../create.zip}/META-INF/vault/properties.xml                         | 0
 .../{stashing.zip => stashing/create.zip}/jcr_root/.content.xml       | 0
 .../{stashing.zip => stashing/create.zip}/jcr_root/tmp/.content.xml   | 0
 .../{stashing2.zip => stashing/update.zip}/META-INF/vault/filter.xml  | 0
 .../update.zip}/META-INF/vault/nodetypes.cnd                          | 0
 .../update.zip}/META-INF/vault/properties.xml                         | 0
 .../{stashing2.zip => stashing/update.zip}/jcr_root/.content.xml      | 0
 .../{stashing2.zip => stashing/update.zip}/jcr_root/tmp/.content.xml  | 0
 11 files changed, 2 insertions(+), 2 deletions(-)
 rename vault-core/src/test/resources/test-packages/{stashing.zip => stashing/create.zip}/META-INF/vault/filter.xml (100%)
 rename vault-core/src/test/resources/test-packages/{stashing.zip => stashing/create.zip}/META-INF/vault/nodetypes.cnd (100%)
 rename vault-core/src/test/resources/test-packages/{stashing.zip => stashing/create.zip}/META-INF/vault/properties.xml (100%)
 rename vault-core/src/test/resources/test-packages/{stashing.zip => stashing/create.zip}/jcr_root/.content.xml (100%)
 rename vault-core/src/test/resources/test-packages/{stashing.zip => stashing/create.zip}/jcr_root/tmp/.content.xml (100%)
 rename vault-core/src/test/resources/test-packages/{stashing2.zip => stashing/update.zip}/META-INF/vault/filter.xml (100%)
 rename vault-core/src/test/resources/test-packages/{stashing2.zip => stashing/update.zip}/META-INF/vault/nodetypes.cnd (100%)
 rename vault-core/src/test/resources/test-packages/{stashing2.zip => stashing/update.zip}/META-INF/vault/properties.xml (100%)
 rename vault-core/src/test/resources/test-packages/{stashing2.zip => stashing/update.zip}/jcr_root/.content.xml (100%)
 rename vault-core/src/test/resources/test-packages/{stashing2.zip => stashing/update.zip}/jcr_root/tmp/.content.xml (100%)