diff --git a/CHANGELOG b/CHANGELOG index 0f4bd1c5d..e1f614ba1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2018-09-06 Version: 1.25.2 +1, AutoScaling support launchTemplate. + 2018-09-06 Version: 1.25.1 1, Add API deleteProduct. 2, Move all API to version 20180120. diff --git a/VERSION b/VERSION index 7c819a961..2aa7a9648 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.25.1 \ No newline at end of file +1.25.2 \ No newline at end of file diff --git a/ess/.idea/workspace.xml b/ess/.idea/workspace.xml index 9fe3fb956..3255a3ae8 100644 --- a/ess/.idea/workspace.xml +++ b/ess/.idea/workspace.xml @@ -1,7 +1,7 @@ - + - + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -25,7 +115,9 @@ - vswitchIdss + ins + instancetypes + alarmActions @@ -46,7 +138,7 @@ - + @@ -94,10 +186,6 @@ - - - - @@ -105,6 +193,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,6 +234,10 @@