Merge pull request #42 from wso2/2.5.x

Merge 2.5.x branch to Master branch
wso2-attic · Jul 15, 2018 · 8407ff5 · 8407ff5
2 parents 97d5c83 + 587658f
commit 8407ff5
Show file tree

Hide file tree

Showing 81 changed files with 1,679 additions and 6,234 deletions.
diff --git a/APIM-ISasKM-with-Analytics/is-as-km/provisioner/product_provisioner.sh b/APIM-ISasKM-with-Analytics/is-as-km/provisioner/product_provisioner.sh
diff --git a/APIM-Microgateway-with-Analytics/README.md b/APIM-Microgateway-with-Analytics/README.md
diff --git a/...gateway-with-Analytics/api-manager-analytics/confs/repository/components/dropins/.gitkeep b/...gateway-with-Analytics/api-manager-analytics/confs/repository/components/dropins/.gitkeep
diff --git a/...eway-with-Analytics/api-manager-analytics/confs/repository/components/extensions/.gitkeep b/...eway-with-Analytics/api-manager-analytics/confs/repository/components/extensions/.gitkeep
diff --git a/...icrogateway-with-Analytics/api-manager-analytics/confs/repository/components/lib/.gitkeep b/...icrogateway-with-Analytics/api-manager-analytics/confs/repository/components/lib/.gitkeep
diff --git a/...alytics/api-manager-analytics/confs/repository/conf/datasources/analytics-datasources.xml b/...alytics/api-manager-analytics/confs/repository/conf/datasources/analytics-datasources.xml
diff --git a/...h-Analytics/api-manager-analytics/confs/repository/conf/datasources/stats-datasources.xml b/...h-Analytics/api-manager-analytics/confs/repository/conf/datasources/stats-datasources.xml
diff --git a/APIM-Microgateway-with-Analytics/api-manager-analytics/provisioner/product_provisioner.sh b/APIM-Microgateway-with-Analytics/api-manager-analytics/provisioner/product_provisioner.sh
diff --git a/APIM-Microgateway-with-Analytics/api-manager/confs/repository/components/dropins/.gitkeep b/APIM-Microgateway-with-Analytics/api-manager/confs/repository/components/dropins/.gitkeep
diff --git a/APIM-Microgateway-with-Analytics/api-manager/confs/repository/components/extensions/.gitkeep b/APIM-Microgateway-with-Analytics/api-manager/confs/repository/components/extensions/.gitkeep
diff --git a/APIM-Microgateway-with-Analytics/api-manager/confs/repository/components/lib/.gitkeep b/APIM-Microgateway-with-Analytics/api-manager/confs/repository/components/lib/.gitkeep