forked from domeos/server
-
Notifications
You must be signed in to change notification settings - Fork 0
/
ChangeLog
14543 lines (9991 loc) · 425 KB
/
ChangeLog
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
commit 5c12870abf944bddd359d924d55ee6872bc2beb2
Author: feiliu206363 <[email protected]>
Date: Tue May 31 10:29:22 2016 +0800
add database info
commit 4022f21deb2df569f85d772d1eb18c47abdbd654
Merge: 9c9d08e 4d0bf97
Author: 刘菲(研究院) <[email protected]>
Date: Mon May 30 18:00:46 2016 +0800
Merge branch 'dev_chandra_monitor_bug' into 'release'
Dev chandra monitor bug
See merge request !16
commit 4d0bf9760dd9614b520138388eaf920a9f4f2eb7
Author: ChandraLee <[email protected]>
Date: Mon May 30 16:51:13 2016 +0800
save
commit 48dbaf89eb9f63891a2384e813fb2544195ce7c5
Author: ChandraLee <[email protected]>
Date: Mon May 30 16:40:24 2016 +0800
switches
commit 9f4b56bc5c7a0a60c4e7241388319f95471f7c62
Author: ChandraLee <[email protected]>
Date: Mon May 30 15:33:13 2016 +0800
remove extend
commit d26dbd2ff074e8b319ca54a83cd8ddd7cf806275
Author: ChandraLee <[email protected]>
Date: Mon May 30 15:18:52 2016 +0800
add unit
commit 9ee4232c2ddc50fe48ce271c8a1634f452549dfa
Author: ChandraLee <[email protected]>
Date: Fri May 27 13:24:23 2016 +0800
charts.clear and add commit info:
commit 943ed97504bfa2896b9b3b9b4638cc20242be812
Author: ChandraLee <[email protected]>
Date: Thu May 26 18:21:30 2016 +0800
save
commit 9c9d08e8b5faa72fabc282e31f319c4adeed5247
Merge: a8fe8ec 34d1d99
Author: 刘菲(研究院) <[email protected]>
Date: Wed May 25 11:49:28 2016 +0800
Merge branch 'dev_chandra_fixbug' into 'release'
dev_chandra_fixbug
修复对外服务ip验证bug
See merge request !15
commit 34d1d9953dc35d0562fa9f9943c933364fb589a1
Author: ChandraLee <[email protected]>
Date: Tue May 24 18:23:21 2016 +0800
save
commit a8fe8ec5697ccd0c197492a3386cb698b933bc92
Merge: 3405e8d fdfaca4
Author: 刘菲(研究院) <[email protected]>
Date: Mon May 23 20:05:08 2016 +0800
Merge branch 'dev_nodelabels' into 'release'
Dev nodelabels
全局配置、集群模块修改；部署对外访问ip交互修改
See merge request !14
commit fdfaca4cf90f1e4961712d685382ac8228f9a33c
Author: baokangwang <[email protected]>
Date: Mon May 23 20:01:57 2016 +0800
print node info in nodelabel legality checker
commit 8b15bbacceb818dc77a29df39dd60ea64576dcd4
Author: baokangwang <[email protected]>
Date: Mon May 23 16:08:06 2016 +0800
fix legality checker for setNodeLabels
commit cb7f8cc5cc769e2609777a11ec1b633d6f40983d
Author: ChandraLee <[email protected]>
Date: Mon May 23 12:29:51 2016 +0800
namespace desription
commit fa20577d6dcd8e6335644f8a108443df503645fe
Author: ChandraLee <[email protected]>
Date: Mon May 23 12:20:57 2016 +0800
next
commit 2b2e67368bcbc4a7eccf5f1dbfddeb9a259a54d4
Author: ChandraLee <[email protected]>
Date: Mon May 23 11:28:43 2016 +0800
addhost page modify description
commit cce62db1213a16b900ed8e9269a7d6ae8cc82f16
Author: ChandraLee <[email protected]>
Date: Fri May 20 19:14:06 2016 +0800
namespace default
commit 18c2d1cec1b9db2353344f10cdd553fcd8a4240f
Author: ChandraLee <[email protected]>
Date: Fri May 20 16:12:19 2016 +0800
save
commit 0ad8f90a18c3b66475a460719d39cc952c55f39a
Author: ChandraLee <[email protected]>
Date: Fri May 20 15:16:35 2016 +0800
host detail add validation
commit 65a6a2e82475c70dbae6a18055ec2d83e2189b8e
Author: ChandraLee <[email protected]>
Date: Fri May 20 14:45:19 2016 +0800
es6 to 5
commit 0b27788deef548989e898227445b6c1e629e10d6
Author: ChandraLee <[email protected]>
Date: Thu May 19 18:14:19 2016 +0800
build host is only one
commit 7decee152c65a71aff543d5d5218c60b7583e28b
Author: ChandraLee <[email protected]>
Date: Thu May 19 11:25:20 2016 +0800
error
commit 05e315ebd349009b8ed59808ce5487595bda693e
Author: ChandraLee <[email protected]>
Date: Thu May 19 11:15:16 2016 +0800
global cluster bug
commit 4dc87a34b769889117e1e58844571dc02c0d26d3
Author: ChandraLee <[email protected]>
Date: Thu May 19 11:02:39 2016 +0800
ips
commit af5fc0ad0c5d64b68d77af9803c8f334a9b1b4ef
Author: ChandraLee <[email protected]>
Date: Wed May 18 14:11:59 2016 +0800
gloabelsetting
commit 3405e8dafc776b035836e59c19b92ff87a3df99e
Author: feiliu206363 <[email protected]>
Date: Wed May 18 14:10:44 2016 +0800
change http timeout to 20s
commit 2f3cde34e79cdad02e1f56806a5364078777d77a
Merge: 878bd32 f1d27c1
Author: ChandraLee <[email protected]>
Date: Wed May 18 14:02:17 2016 +0800
Merge branch 'dev_nodelabels' of code.sohuno.com:feiliu206363/DomeOS into dev_nodelabels
commit 878bd3208b38a8a84c9f3402b02390b1b2dac563
Merge: 9a30055 882fe1d
Author: ChandraLee <[email protected]>
Date: Wed May 18 14:01:59 2016 +0800
Merge branch 'dev_chandra_cluster' of code.sohuno.com:feiliu206363/DomeOS into dev_nodelabels
commit 882fe1d3e47a79f42ef78a0ff797e0de954e4fba
Author: ChandraLee <[email protected]>
Date: Wed May 18 14:01:18 2016 +0800
eslint
commit f1d27c1cb65be54ba0c084a974a58534d5fb4138
Merge: e11cbea 9a30055
Author: baokangwang <[email protected]>
Date: Wed May 18 13:39:01 2016 +0800
Merge branch 'dev_nodelabels' of http://code.sohuno.com/feiliu206363/DomeOS into dev_nodelabels
commit e11cbeaebefd1b96034ccdc97be96fb26afcedce
Author: baokangwang <[email protected]>
Date: Wed May 18 13:38:54 2016 +0800
add build tag for cluster & add clusterId and clusterName in global cicluster setting
commit 9a3005542b9bb1b2488ffe483e7a68a6224c7628
Merge: 94e4bb7 5c4a7d2
Author: ChandraLee <[email protected]>
Date: Wed May 18 13:20:45 2016 +0800
Merge branch 'dev_chandra_cluster' of code.sohuno.com:feiliu206363/DomeOS into dev_nodelabels
commit 5c4a7d26a7e46499ccd00cb9b1c4da0c8e95b5e2
Author: ChandraLee <[email protected]>
Date: Wed May 18 13:19:44 2016 +0800
cluster modify
commit b7884f28d9e53a4ff6c644225df39be5caba0d3a
Author: feiliu206363 <[email protected]>
Date: Tue May 17 22:29:44 2016 +0800
add response release
commit 94e4bb78a3c006f6c63a1ea30064e97819c625b9
Author: baokangwang <[email protected]>
Date: Tue May 17 18:13:12 2016 +0800
add/delete nodelabel as list
commit e1ac6aec1704e00268de9a2bf0f8cbbab4d537a2
Author: ChandraLee <[email protected]>
Date: Tue May 17 18:09:20 2016 +0800
save globalsetting
commit 2610acc21201acde55aaa05747e0346d2adfa49b
Author: feiliu206363 <[email protected]>
Date: Tue May 17 17:24:29 2016 +0800
change message, change http timeout config
commit c39df15d381926731add80572692f3bd634d965f
Author: feiliu206363 <[email protected]>
Date: Tue May 17 16:58:45 2016 +0800
add printstack for test
commit 092a617874cf0ad0fbac184700ad7b7c5e9cf42a
Merge: c865d3e 119cebd
Author: 刘菲(研究院) <[email protected]>
Date: Mon May 16 13:58:21 2016 +0800
Merge branch 'fix_deployment_multi_thread' into 'release'
add the muti-thread support for list deployment.
See merge request !12
commit 119cebd8af77197d16d29fd78a4e10f1b3795842
Author: kairen <[email protected]>
Date: Mon May 16 13:55:19 2016 +0800
remove list deployment throw exception when get one deployment.
commit c71ffa07ab5eb19cffdfdf043643bb8044758dcd
Author: kairen <[email protected]>
Date: Fri May 13 18:33:43 2016 +0800
add the muti-thread support for list deployment.
commit c865d3ee60dde11a6e3163774796e24624de248c
Merge: 8fa04ad 14ccc1e
Author: 刘菲(研究院) <[email protected]>
Date: Fri May 13 11:34:58 2016 +0800
Merge branch 'dev_fix_deployment_resource_request' into 'release'
fix get resource owner info to multi-thread
See merge request !11
commit 14ccc1e4eeed1df711027acaf163ca76bcf6f7cc
Author: baokangwang <[email protected]>
Date: Thu May 12 17:38:05 2016 +0800
fix get resource owner info to multi-thread
commit 8fa04add0f747d3f4667d0ec3224e8d6aa698248
Merge: 5b6248a 4f2cea0
Author: 刘菲(研究院) <[email protected]>
Date: Thu May 12 10:56:26 2016 +0800
Merge branch 'dev_fix_deployment_resource_request' into 'release'
add clusterName and namespace for resourceOwnerInfo
See merge request !9
commit 4f2cea0490c9c7be89b88291154121a5546f02ed
Author: baokangwang <[email protected]>
Date: Thu May 12 10:17:11 2016 +0800
check null cluster
commit 478f18db11291f643d57cc2adf7181d9428d65f9
Author: baokangwang <[email protected]>
Date: Wed May 11 21:08:04 2016 +0800
add clusterName and namespace for resourceOwnerInfo
commit 5b6248a4333d49bb8d9a0629c50b77820e12f61d
Merge: f3f81d7 37527ac
Author: 刘菲(研究院) <[email protected]>
Date: Wed May 11 14:36:00 2016 +0800
Merge branch 'dev_cluster_hostname' into 'release'
fix hostname param in cluster api
See merge request !8
commit 37527ac889d772b26dc385326904dcabcf58b402
Author: baokangwang <[email protected]>
Date: Tue May 10 17:03:02 2016 +0800
delete redundant log
commit 5934468d8caf874b41f9997d7b954891e7f0ea83
Author: baokangwang <[email protected]>
Date: Tue May 10 16:43:03 2016 +0800
fix hostname param in cluster api
commit f3f81d77894350261b12850a8fd09fcccf98c93a
Author: feiliu206363 <[email protected]>
Date: Tue May 10 16:39:47 2016 +0800
fix bug in BaseImageCustom job delete
commit ec134bde16703d17ff259ebfecb8a7bc78053b49
Author: feiliu206363 <[email protected]>
Date: Tue May 10 14:45:42 2016 +0800
fixu bug in project list order
commit a418f7540fc73edd2e2f90d7684a51db164ce343
Merge: b3516f9 56a4244
Author: feiliu206363 <[email protected]>
Date: Mon May 9 15:26:13 2016 +0800
Merge branch 'dev_alarm' into release
commit 56a4244d19380605110165882d5506c16dd7bb2b
Author: ChandraLee <[email protected]>
Date: Mon May 9 14:08:25 2016 +0800
+
commit b3516f9f8a3f86285c4e1ec029064804a4d6123a
Merge: 0808ee1 456fab0
Author: 刘菲(研究院) <[email protected]>
Date: Mon May 9 13:26:15 2016 +0800
Merge branch 'dev_alarm' into 'release'
Dev alarm
See merge request !7
commit 456fab02865118b4953269a36f2bd521a4bd5664
Author: baokangwang <[email protected]>
Date: Mon May 9 13:18:16 2016 +0800
fix null pointer in pod monitor
commit 4c535221403f9c1a4b3139e8cf4820a3079997c9
Merge: 13b1fef 0808ee1
Author: baokangwang <[email protected]>
Date: Mon May 9 11:53:04 2016 +0800
Merge branch 'release' into dev_alarm
commit 13b1fef9bb1cc8a0052fb0fc01643a2d984ebcb1
Author: baokangwang <[email protected]>
Date: Mon May 9 11:51:48 2016 +0800
fix email checking
commit 2eee09dbe7803f4693a8474c86cec938045bf80a
Merge: 32903c8 524c727
Author: baokangwang <[email protected]>
Date: Mon May 9 11:26:01 2016 +0800
Merge branch 'dev_alarm' of http://code.sohuno.com/feiliu206363/DomeOS into dev_alarm
commit 32903c8114b92e8b722e334713c9df7b289c8b8a
Author: baokangwang <[email protected]>
Date: Mon May 9 11:25:53 2016 +0800
add sms&mail interface for sohu
commit 524c7273cbe215c28a747a0aff9b495d181cdedb
Author: ChandraLee <[email protected]>
Date: Mon May 9 11:04:32 2016 +0800
gulpfile
commit 0808ee160a75d3af0a87e38623ed27e7dd25a843
Author: xupeng <[email protected]>
Date: Fri May 6 17:31:01 2016 +0800
add:context manager
commit 325b5dfc08b099ed0624791b73c3363b208a06b1
Author: ChandraLee <[email protected]>
Date: Fri May 6 17:24:11 2016 +0800
Logout
commit d08130e1635f9abf4e513aae6de8705edc7d9fc3
Merge: b79b3bc a12fc65
Author: ChandraLee <[email protected]>
Date: Fri May 6 14:52:31 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit b79b3bc2f1f3ed8dc6c54808bbab56c225ebd599
Author: ChandraLee <[email protected]>
Date: Fri May 6 14:52:15 2016 +0800
save
commit a12fc65abf1a56c5b3a15328500f962cd049caef
Author: baokangwang <[email protected]>
Date: Fri May 6 10:42:08 2016 +0800
fix ldap config: support blank email suffix
commit 171e02d1f8c07c1b3262c07d609af696cecfb761
Author: baokangwang <[email protected]>
Date: Fri May 6 10:21:28 2016 +0800
delete user by id instead of username
commit 8c70678f55d4c98dabc88019f2d1e4e30fbbf66e
Merge: 24bb7bf 5f80b5d
Author: ChandraLee <[email protected]>
Date: Thu May 5 23:33:00 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 24bb7bf121bde0c524607cac851bc6874ac46e7f
Author: ChandraLee <[email protected]>
Date: Thu May 5 23:32:39 2016 +0800
user
commit 5f80b5de85a1ba150d8e8d01fb58c508fd84947d
Author: baokangwang <[email protected]>
Date: Thu May 5 23:27:36 2016 +0800
add email for new LDAP user
commit ef4e3fd128e81de60e6dbaa202c468728d6b7805
Author: baokangwang <[email protected]>
Date: Thu May 5 23:07:56 2016 +0800
fix user
commit 6f4fd151dd3db4d3601cf3ded4bf0adcbb2f2f06
Author: feiliu206363 <[email protected]>
Date: Thu May 5 22:17:49 2016 +0800
add null judgment in create job
commit 19f742ebd9035e46442ca7a495e364c19eabfb36
Merge: f0fc054 bbaff65
Author: baokangwang <[email protected]>
Date: Thu May 5 21:47:02 2016 +0800
Merge branch 'dev_alarm' of http://code.sohuno.com/feiliu206363/DomeOS into dev_alarm
commit f0fc054320a4816891672db9c7595bbc71f15a93
Author: baokangwang <[email protected]>
Date: Thu May 5 21:46:51 2016 +0800
update user modify interface
commit bbaff658a118f32e547adfbcdb3d1c805a85ae57
Merge: 5e45cb1 4dbd1dd
Author: ChandraLee <[email protected]>
Date: Thu May 5 17:35:14 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 5e45cb1cf1dd27a8e740d1cf05a92d2da0888506
Author: ChandraLee <[email protected]>
Date: Thu May 5 17:34:59 2016 +0800
save
commit 4dbd1dd7d6195b81f0404b9ef5b9035936d295da
Merge: 43e8572 de0c96a
Author: baokangwang <[email protected]>
Date: Thu May 5 15:18:26 2016 +0800
Merge branch 'dev_alarm' of http://code.sohuno.com/feiliu206363/DomeOS into dev_alarm
commit 43e857255e476ad269fb49dc308b8e2ed479df48
Merge: d40e161 180e091
Author: baokangwang <[email protected]>
Date: Thu May 5 15:18:12 2016 +0800
Merge branch 'release' into dev_alarm
commit de0c96a7f064ae8e01b3809a6fd815ccae43df19
Author: ChandraLee <[email protected]>
Date: Thu May 5 12:00:22 2016 +0800
eslint
commit c0cb3ef9bfe48207eff3ebf0ef05c0290caba715
Merge: 2b6d75d 180e091
Author: ChandraLee <[email protected]>
Date: Thu May 5 11:37:27 2016 +0800
Merge branch 'release' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 180e091bdded39c00212248b364d1b63be72a0cf
Merge: 2c5535d a5c8b5a
Author: 刘菲(研究院) <[email protected]>
Date: Thu May 5 11:28:03 2016 +0800
Merge branch 'dev_change_deploy_log' into 'release'
dev_change_deploy_log
去掉部署日志预处理命令的必填验证
See merge request !6
commit a5c8b5ad4c874daf36b5787071166cb69a8d1b81
Author: ChandraLee <[email protected]>
Date: Thu May 5 11:14:24 2016 +0800
save
commit 2b6d75d24bcc9c2c1086affb46a8c8abd74e883f
Merge: b84da1f d40e161
Author: ChandraLee <[email protected]>
Date: Thu May 5 11:06:04 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit b84da1f06c166a40ce2f577031505498cb10d82e
Author: ChandraLee <[email protected]>
Date: Thu May 5 11:05:25 2016 +0800
save
commit d40e161f42f43cd4c6c3bf96c24ccf8889e2680d
Author: baokangwang <[email protected]>
Date: Wed May 4 14:35:50 2016 +0800
fix portal updater
commit bdcb30def672210a9218056db7802e386210c748
Author: ChandraLee <[email protected]>
Date: Tue May 3 18:02:00 2016 +0800
global setting
commit 1a34e05a921e05a46b2d71641982a66d1cb8b951
Author: ChandraLee <[email protected]>
Date: Tue May 3 14:22:25 2016 +0800
save
commit ae69a0bd72bb4383b66401427b4596e7f7b543dc
Author: ChandraLee <[email protected]>
Date: Tue May 3 14:10:58 2016 +0800
监控报警”
commit 97b9ca03b2560db93430c82771030ad88ce5ef60
Merge: d67c684 014cd04
Author: ChandraLee <[email protected]>
Date: Tue May 3 14:07:36 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit d67c6843f13ff62c90441eab87a7cb95c8ef15eb
Author: ChandraLee <[email protected]>
Date: Tue May 3 14:07:20 2016 +0800
bug
commit b5929a94a06353e1af6cd8726ef324938c016fda
Author: ChandraLee <[email protected]>
Date: Tue May 3 11:31:48 2016 +0800
remove comments
commit 014cd04f74b32a4f55baa022e37e612aceaf168b
Merge: 2bd6d3d 868ed14
Author: baokangwang <[email protected]>
Date: Tue May 3 11:26:07 2016 +0800
Merge branch 'dev_alarm' of http://code.sohuno.com/feiliu206363/DomeOS into dev_alarm
commit 868ed14e86a48744472661297b13d71dfcb129b1
Author: ChandraLee <[email protected]>
Date: Tue May 3 11:25:18 2016 +0800
hbs
commit 2bd6d3df1727071e614a300fc385ceb3f6c53f4e
Merge: 59ab05c 8497295
Author: baokangwang <[email protected]>
Date: Tue May 3 10:48:21 2016 +0800
Merge branch 'dev_alarm' of http://code.sohuno.com/feiliu206363/DomeOS into dev_alarm
commit 59ab05c9460a990bd82ec84fbdf69c23859537a4
Author: baokangwang <[email protected]>
Date: Tue May 3 10:48:13 2016 +0800
add container updating
commit 849729523cfd39a54ac301b3881443203e0c68f1
Author: ChandraLee <[email protected]>
Date: Tue May 3 10:46:50 2016 +0800
route change
commit cc5efb80f3048388e8f0ad7afeaeee1131bb9d2e
Merge: ef9ef70 c934175
Author: ChandraLee <[email protected]>
Date: Fri Apr 29 21:43:57 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit ef9ef706960d93cf05b01ff5b15804b9909f6477
Author: ChandraLee <[email protected]>
Date: Fri Apr 29 21:43:42 2016 +0800
save
commit c93417562fdca6885384b4ac59fadc351176e9b5
Author: baokangwang <[email protected]>
Date: Fri Apr 29 11:15:33 2016 +0800
fix cluster name aquire
commit 636497b0c39d885b3f3149f417cea4111991f927
Merge: 316f273 4f83449
Author: ChandraLee <[email protected]>
Date: Thu Apr 28 19:50:10 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 316f273653843c20d675e36bbe6b6f88c12c1274
Author: ChandraLee <[email protected]>
Date: Thu Apr 28 19:49:50 2016 +0800
save
commit 4f83449ed0b99eff6a03995f32a6bfb6253abe2b
Merge: ec0c813 c98ff4c
Author: baokangwang <[email protected]>
Date: Thu Apr 28 15:12:21 2016 +0800
Merge branch 'dev_alarm' of http://code.sohuno.com/feiliu206363/DomeOS into dev_alarm
commit ec0c81390be09cfe87e25e4cc7fc118479a4f77b
Author: baokangwang <[email protected]>
Date: Thu Apr 28 15:11:58 2016 +0800
add device tag
commit c98ff4c70140890fb8d8a70c45524219ec2f6b10
Author: ChandraLee <[email protected]>
Date: Thu Apr 28 14:38:47 2016 +0800
save
commit c68f9e8b245b9c903337347a4a802ba4af3507cf
Merge: 91bc4f6 2c5535d
Author: ChandraLee <[email protected]>
Date: Thu Apr 28 14:08:56 2016 +0800
group manage time
commit 91bc4f6e27a2caf1da26eb804cb61eb36560c2a3
Author: ChandraLee <[email protected]>
Date: Thu Apr 28 14:00:34 2016 +0800
save
commit d8a76c3fa6592585d0dffac7589420e28647301d
Author: ChandraLee <[email protected]>
Date: Thu Apr 28 13:50:21 2016 +0800
save
commit eab74ccdaa3df16c4e00be79a953545310cf7aec
Author: ChandraLee <[email protected]>
Date: Wed Apr 27 22:02:18 2016 +0800
save
commit 35a35c10df9520a91c68e5f0a521b07828fd2bb8
Merge: 15e1362 dada158
Author: ChandraLee <[email protected]>
Date: Wed Apr 27 18:31:08 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 15e136214a00fa5d6c18e440cddd29f58a045e5a
Author: ChandraLee <[email protected]>
Date: Wed Apr 27 18:30:10 2016 +0800
save
commit 2c5535dac4ddfddddc2aa61b4ce8af10db6ccd88
Merge: be07408 2ef49ee
Author: 刘菲(研究院) <[email protected]>
Date: Wed Apr 27 18:16:27 2016 +0800
Merge branch 'release_fix_mysql' into 'release'
fix mysql script
See merge request !5
commit dada158a06025cfd5fd5ef92db00665882ba1074
Author: baokangwang <[email protected]>
Date: Wed Apr 27 18:00:49 2016 +0800
fix alarm group deletion
commit 2ef49ee4920b783df17f42ddad5541422233e142
Author: illegal <scs@tc_150_71>
Date: Tue Apr 26 21:04:51 2016 +0800
fix mysql script
commit be07408d84445440626b28cc099d4bb02e004ec1
Author: feiliu206363 <[email protected]>
Date: Tue Apr 26 20:19:15 2016 +0800
change sql
commit cccef871c34a2cd048ee52f71f5e5ffd0803c69b
Author: ChandraLee <[email protected]>
Date: Tue Apr 26 19:50:52 2016 +0800
save
commit 67ce7dc0465662d769b764126546a3bebf983407
Merge: 613e801 dde29e2
Author: ChandraLee <[email protected]>
Date: Tue Apr 26 15:29:09 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 613e801e8f064375b7a0e9cb8dec648bec32ed9e
Author: ChandraLee <[email protected]>
Date: Tue Apr 26 15:28:48 2016 +0800
save
commit dde29e2026d3f6294cab4f28764706a7269cbc9e
Author: baokangwang <[email protected]>
Date: Tue Apr 26 15:07:58 2016 +0800
fix add host
commit eb9f3f20cda0835dfa8380c44266eb36f9086575
Merge: d6e46ef 3c10302
Author: 刘菲(研究院) <[email protected]>
Date: Mon Apr 25 19:44:50 2016 +0800
Merge branch 'dev_chandra' into 'release'
Dev chandra
表格里面鼠标移入该行，链接变色
See merge request !4
commit a0610d8e3590258db47669773d54e925e2eaab00
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 18:30:08 2016 +0800
list style
commit 3c10302df0239fb0a4c42b04d9139000018a1b08
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 17:43:43 2016 +0800
break
commit 366c37575545a45c639747ea51a48397eecd798f
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 17:40:52 2016 +0800
ui-table-link
commit 829d3c116521ecedb19d910382c4b452b9af248c
Merge: 018936d d6e46ef
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 17:34:30 2016 +0800
merge release and resolve conflict
commit 018936d712c6a8d6f84c45a90bc46858cf262235
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 17:09:16 2016 +0800
bug
commit a229f0a04cfd9d9d4df97890a1df42353f505e89
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 15:04:37 2016 +0800
Save
commit b8b112dc94b17a4257411cc1d3f38e88a83b6887
Merge: 53fb444 1d43e1d
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 14:53:43 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 53fb444cc64cadafa54c9c422788634821ef1ba9
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 14:53:27 2016 +0800
save
commit 1d43e1d853f6c8759f6631075c39e1d9b7de2fae
Author: baokangwang <[email protected]>
Date: Mon Apr 25 14:47:28 2016 +0800
fix bugs
commit d6e46ef4052ee7fd49a16172d78586b88fa9e227
Merge: fca2b00 1391e98
Author: 刘菲(研究院) <[email protected]>
Date: Mon Apr 25 14:35:41 2016 +0800
Merge branch 'dev_baseimagecustom_fix' into 'release'
add some comments; fix the imagesize bug; fix the usage of Authutil.
add some comments;
fix the imagesize bug;
fix the usage of Authutil.
See merge request !3
commit fca2b006cf148a28583334b7300dcd7f9e9362b8
Merge: b151592 e59e0c5
Author: 刘菲(研究院) <[email protected]>
Date: Mon Apr 25 13:17:50 2016 +0800
Merge branch 'dev_chandra' into 'release'
Dev chandra
集群重名验证
See merge request !2
commit e59e0c50b780f127912e53737bb713dc726b87e7
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 13:14:42 2016 +0800
test code
commit 9f4c9de6710a1031e872f467f3eeff8e86b9a021
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 12:27:17 2016 +0800
cluster name
commit 44aff8c66d0620118f84bc9f913cb5e19906e5a4
Author: ChandraLee <[email protected]>
Date: Mon Apr 25 12:12:35 2016 +0800
save
commit b151592132a18f26aaba85b4fdfc77d7579f77a0
Merge: be96bb4 b5b8a96
Author: feiliu206363 <[email protected]>
Date: Fri Apr 22 00:05:54 2016 +0800
Merge branch 'release-0.2.1-beta' into release
commit b5b8a96a5c6e41adedec8d1b26e3e9ed8ce77bc8
Author: feiliu206363 <[email protected]>
Date: Fri Apr 22 00:05:32 2016 +0800
delete
commit 76ac0b1b0637c8f19acc9ed77efeade4ae81f6a4
Merge: 8fbe1b1 f02dc0d
Author: ChandraLee <[email protected]>
Date: Fri Apr 22 00:03:00 2016 +0800
confict
commit 8fbe1b140b7da48981b472fffd4de9213a31e017
Merge: f1f8873 6a4f8e2
Author: ChandraLee <[email protected]>
Date: Fri Apr 22 00:00:49 2016 +0800
conflict
commit 6a4f8e24363bc4a8f2de78510d5daac3c28da781
Author: ChandraLee <[email protected]>
Date: Thu Apr 21 23:57:11 2016 +0800
save
commit f02dc0ddfafa12501538efa28edb8b88ce56eda4
Merge: 5e88c8c 1c8d011
Author: baokangwang <[email protected]>
Date: Thu Apr 21 23:37:47 2016 +0800
Merge branch 'dev_monitor_fix' into release-0.2.1-beta
commit 5e88c8cab9503558bc7f8bc06b87f55168bffb74
Author: feiliu206363 <[email protected]>
Date: Thu Apr 21 23:34:22 2016 +0800
change gitignore
commit 0f9b4f327cb69d20d88081c3267c98bf2ddd0d1d
Author: baoquanwang <[email protected]>
Date: Thu Apr 21 23:31:40 2016 +0800
delete unused import
commit 1c8d01199b78fa44b3237e9407e3ec4388115ef8
Author: ChandraLee <[email protected]>
Date: Thu Apr 21 23:27:29 2016 +0800
save
commit 80e7f7edc02f941adadf64c05e01e502f6ddeffd
Merge: 6369cba c9338a6
Author: baokangwang <[email protected]>
Date: Thu Apr 21 23:03:37 2016 +0800
Merge branch 'dev_alarm' of http://code.sohuno.com/feiliu206363/DomeOS into dev_alarm
commit 6369cba5320484a4485e0b63e292aebfc1090ec2
Author: baokangwang <[email protected]>
Date: Thu Apr 21 23:03:15 2016 +0800
fix checkstyle
commit f1f8873aaad4c09caafc18dbe6ac33affa2ce1a8
Author: ChandraLee <[email protected]>
Date: Thu Apr 21 23:02:40 2016 +0800
monitor bug and modify console
commit 9d0e0f82f3975fbe982b69a65217d8a54781e25f
Author: baokangwang <[email protected]>
Date: Thu Apr 21 22:37:09 2016 +0800
add clusterName for deploymentInfo & throw ApiException
commit 2f98465cc81782ce1aeeb787b912d6305acd076c
Merge: e6d7eab be96bb4
Author: ChandraLee <[email protected]>
Date: Thu Apr 21 22:23:58 2016 +0800
Merge branch 'release' of code.sohuno.com:feiliu206363/DomeOS into release-0.2.1-beta
commit c9338a6c871f29a12e88d7ce9649dfce7f2e575c
Merge: 4480af4 5865501
Author: ChandraLee <[email protected]>
Date: Thu Apr 21 22:23:14 2016 +0800
Merge branch 'dev_alarm' of code.sohuno.com:feiliu206363/DomeOS into dev_alarm
commit 4480af47872e66f57b8e54bb08e3d7616c5b4dbf
Author: ChandraLee <[email protected]>
Date: Thu Apr 21 22:22:52 2016 +0800
save