Commits · 2ad9d86f4b1d915ba21384d339b5636deff68220 · openSource / apollo

22 Jul, 2016 12 commits
- Merge branch 'master' into 'release' · 2ad9d86f
  zl张乐(IT) authored Jul 22, 2016
```
Master2Release



See merge request !7
```
  2ad9d86f
- Merge pull request #343 from lepdou/bugfix_0722 · 4c29c113
  Jason Song authored Jul 22, 2016
```
bugfix release title
```
  4c29c113
- bugfix release title · b7dedec2
  lepdou authored Jul 22, 2016
  
  b7dedec2
- Merge pull request #342 from nobodyiam/apollo-demo-id · 769f57af
  Jason Song authored Jul 22, 2016
```
update apollo demo appid
```
  769f57af
- update apollo demo appid · 8dd6c171
  Jason Song authored Jul 22, 2016
  
  8dd6c171
- Merge pull request #340 from lepdou/rollback · 86b6ed05
  Jason Song authored Jul 22, 2016
```
bugfix release 兼容性问题
```
  86b6ed05
- Merge pull request #341 from nobodyiam/fix-properties-file-notification · 26234224
  张乐 authored Jul 22, 2016
```
Fix properties file notification
```
  26234224
- remove unused import · f5c03f96
  Jason Song authored Jul 22, 2016
  
  f5c03f96
- fix properties file notification · bcd213d6
  Jason Song authored Jul 22, 2016
  
  bcd213d6
- bugfix release 兼容性问题 · 8776edc8
  lepdou authored Jul 22, 2016
  
  8776edc8
- Merge pull request #339 from lepdou/rollback · 15e27550
  Jason Song authored Jul 22, 2016
```
bugfix page scroll to top when modal open
```
  15e27550
- bugfix page scroll to top when modal open · 9b7cbea5
  lepdou authored Jul 22, 2016
  
  9b7cbea5
21 Jul, 2016 11 commits
- Merge pull request #338 from nobodyiam/configfile-cache-hit · d3168bbc
  张乐 authored Jul 21, 2016
```
record cache hit statistics
```
  d3168bbc
- record cache hit statistics · ab38ec3a
  Jason Song authored Jul 21, 2016
  
  ab38ec3a
- Merge pull request #337 from nobodyiam/shuffle-admin-services · ba6c1699
  张乐 authored Jul 21, 2016
```
Shuffle admin services
```
  ba6c1699
- remove unused import · b75db7af
  Jason Song authored Jul 21, 2016
  
  b75db7af
- move shuffle logic to service locator · 9ad76d7c
  Jason Song authored Jul 21, 2016
  
  9ad76d7c
- shuffle admin services to achieve load balance · 782796c9
  Jason Song authored Jul 21, 2016
  
  782796c9
- Merge pull request #336 from nobodyiam/fix-notification-controller-invalid-format · e0fcbb9f
  张乐 authored Jul 21, 2016
```
protect notification controller when the input format is invalid
```
  e0fcbb9f
- protect notification controller when the input format is invalid · 09889565
  Jason Song authored Jul 21, 2016
  
  09889565
- Merge pull request #335 from lepdou/cat_log · 0447fca3
  Jason Song authored Jul 21, 2016
```
cat log & 按钮放重复点击 & call admin server retry
```
  0447fca3
- update · 10b9281f
  lepdou authored Jul 21, 2016
  
  10b9281f
- cat log & 按钮放重复点击 & call admin server retry · b2b9dcd0
  lepdou authored Jul 21, 2016
  
  b2b9dcd0
20 Jul, 2016 6 commits
- Merge pull request #334 from nobodyiam/adjust-tomcat-max-header-size · e6c9c222
  张乐 authored Jul 20, 2016
```
Increase tomcat header size for longer GET query parameter
```
  e6c9c222
- Increase tomcat header size for longer GET query parameter · 406a2ece
  Jason Song authored Jul 20, 2016
  
  406a2ece
- Merge pull request #333 from nobodyiam/fix-java-7 · b90e4164
  张乐 authored Jul 20, 2016
```
change to ConcurrentMap to use putIfAbsent method in java 1.7
```
  b90e4164
- change to ConcurrentMap to use putIfAbsent method in java 1.7 · 5b1a9021
  Jason Song authored Jul 20, 2016
  
  5b1a9021
- Merge pull request #332 from nobodyiam/client-long-poll-refactor-merge · 562bc959
  张乐 authored Jul 20, 2016
```
multiple namespaces reuse the same long poll connection
```
  562bc959
- multiple namespaces reuse the same long poll connection · 47d1940b
  Jason Song authored Jul 20, 2016
  
  47d1940b
18 Jul, 2016 6 commits
- Merge branch 'master' into 'release' · 249f6a8e
  zl张乐(IT) authored Jul 18, 2016
```
bugfix 导航栏选中样式错乱



See merge request !5
```
  249f6a8e
- Merge pull request #331 from lepdou/bugfix_0817 · 90d635ec
  Jason Song authored Jul 18, 2016
```
bugfix 导航栏选中样式错乱
```
  90d635ec
- bugfix 导航栏选中样式错乱 · bbed4dfe
  lepdou authored Jul 18, 2016
  
  bbed4dfe
- Merge branch 'master' into 'release' · 05d21d21
  vss宋顺 authored Jul 18, 2016
```
Master2Release



See merge request !4
```
  05d21d21
- Merge pull request #330 from lepdou/bugfix_0718 · b536c2d8
  Jason Song authored Jul 18, 2016
```
初始化private app namespace的权限放在transaction里面
```
  b536c2d8
- 初始化private app namespace的权限放在transaction里面 · 10d17f87
  lepdou authored Jul 18, 2016
  
  10d17f87
15 Jul, 2016 5 commits
- Merge pull request #326 from lepdou/ut · 4c64de67
  Jason Song authored Jul 15, 2016
```
ut
```
  4c64de67
- bugfix 删除配置的时候锁开关没判断 · 835fdcbb
  lepdou authored Jul 15, 2016
  
  835fdcbb
- Merge pull request #329 from lepdou/history · 189c2188
  Jason Song authored Jul 15, 2016
```
判断是否添加重复key的时候,过滤掉已删除并且发布过的配置
```
  189c2188
- 判断是否添加重复key的时候,过滤掉已删除并且发布过的配置 · 7d90bee5
  lepdou authored Jul 15, 2016
  
  7d90bee5
- update · 63774ac9
  lepdou authored Jul 15, 2016
  
  63774ac9