tree 4f67161694ffb79ab44d4d7142cf192abbaa5c6d
parent 152578bed1a247d50d260d79c48dcf600a06a329
parent a897ed8f89c594e05454647439d41ed145f87559
author Hugo Arès <hugo.ares@ericsson.com> 1496839162 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1496839162 -0400

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Migrate plugin config to own configuration file

Annotate CacheEvictionIT as @Ignore again since it needs to be
adapted to the new plugin configuration. This will be done in a
follow-up commit.

Change-Id: I84618d0fe6c1ef8784b225d3f60b1b41560870f5