closes #7200
authorradhika <radhika@curoverse.com>
Wed, 30 Sep 2015 15:53:20 +0000 (11:53 -0400)
committerradhika <radhika@curoverse.com>
Wed, 30 Sep 2015 15:53:20 +0000 (11:53 -0400)
commit6c31bea91f136bb300376847ced1fd965e037dd3
treebe49f5074aa418806167b2395422c5bc10c78e52
parent3cbdb14acde0092ae4f33e41a4bf10c6a1fce052
parent23ac9d35b87e4930fc01318d44134693f62c1264
closes #7200
Merge branch '7200-keepproxy-index-api'