Code

更新代码#6

Code

Merged

KeRan213539 merged 81 commits intoKeRan213539:developKeRan213539/nacos:developfrom alibaba:developalibaba/nacos:developCopy head branch name to clipboardOct 22, 2020

+2,982-342

Commits

Commits on Jun 17, 2020

• improvement: merge upstream/develop

  chuntaojun

  committed
  9585d55

Commits on Jun 18, 2020

• refactor: merge upstream develop

  chuntaojun

  committed
  29df82f

Commits on Jun 19, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  78167ab

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  7915e4f

Commits on Jun 24, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  9e7cf30

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  3d8b55c

• feat: merge upstream develop

  chuntaojun

  committed
  a07f84e

Commits on Jun 29, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  f181102

Commits on Jul 16, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  abee9c4

Commits on Jul 17, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  4dbd796

Commits on Jul 19, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into new_develop

  chuntaojun

  committed
  7455f51

Commits on Jul 23, 2020

• feat: create rocksdb storage

  chuntaojun

  committed
  5bf0212

Commits on Jul 25, 2020

• finish stop old raft run logic

  

  springliao

  committed
  3b5365c

Commits on Jul 26, 2020

• Major logical completion

  

  springliao

  committed
  e90ac7e

Commits on Jul 27, 2020

• create error code

  chuntaojun

  committed
  018ce14

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  d3ce09b

Commits on Jul 28, 2020

• fix code style

  chuntaojun

  committed
  e08a6ad

Commits on Aug 10, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  14039fd

Commits on Aug 12, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  71c8530

Commits on Aug 19, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  f5971e9

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  544e053

Commits on Aug 20, 2020

• fix: create kvstorage

  chuntaojun

  committed
  c3ac2c0

• Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming

  chuntaojun

  committed
  36e213a

• Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming

  chuntaojun

  committed
  b495348

• refactor: create kv storage]

  chuntaojun

  committed
  e9af4e1

Commits on Aug 21, 2020

• Jraft naming (#3660)

  Show description for c617afe
  

  5 peopleauthored
  c617afe

• refactor: refactor rocksdb storage code

  chuntaojun

  committed
  112d213

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  6ddab75

Commits on Aug 27, 2020

• feat: merge upstream develop

  chuntaojun

  committed
  4db9842

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  3fac6c9

Commits on Aug 29, 2020

• fix: fixed cluster node version issue

  chuntaojun

  committed
  ccb0bda

Commits on Sep 1, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  bc7d6b1

Commits on Sep 2, 2020

• refactor: adjust the data loading logic when a new protocol is started

  chuntaojun

  committed
  f54f319

• Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming

  chuntaojun

  committed
  63cda26

Commits on Sep 3, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  d6e5c46

• feat: merge upstream develop

  chuntaojun

  committed
  acbd5bf

• feat: none

  chuntaojun

  committed
  304ebe9

• fix: fixing serialization problems

  chuntaojun

  committed
  f2adaff

Commits on Sep 14, 2020

• fix: fixed some logic errors

  chuntaojun

  committed
  bb3e1dd

• fix: fix conflict

  chuntaojun

  committed
  4e8936b

• Jraft naming (#3826)

  Show description for 7101b6b
  

  11 peopleauthored
  7101b6b

Commits on Sep 16, 2020

• For checkstyle and pmd

  KomachiSion

  committed
  fdee6b8

Commits on Sep 22, 2020

• Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming

  chuntaojun

  committed
  acb6b1f

• Fix jraft problem

  KomachiSion

  committed
  3592846

• feat: merge from xiwen

  chuntaojun

  committed
  11873f9

• Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming

  chuntaojun

  committed
  0da7224

Commits on Sep 23, 2020

• Temp fix raft server can't refresh raft configuration problem

  KomachiSion

  committed
  825fe6c

• Fix Listener do not listen new consistency problem

  KomachiSion

  committed
  63dafba

• Fix Performance logger thread call old raft error

  KomachiSion

  committed
  f792300

• Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming

  chuntaojun

  committed
  bb4bc3c

Commits on Sep 24, 2020

• Use datum in new raft processor to compatible old data

  KomachiSion

  committed
  eceab55

Commits on Sep 25, 2020

• Use multiple kv storage in new raft processor to compatible old data

  KomachiSion

  committed
  170f979

• Revert PR#2849.

  KomachiSion

  committed
  481a1f9

• Move datum key check to KeyBuilder

  KomachiSion

  committed
  402ad12

• Fix 1.3.2 upgrade 1.4.0 can't notify service change problem

  KomachiSion

  committed
  ea51542

Commits on Sep 29, 2020

• refactor: merge xiwen branch

  chuntaojun

  committed
  a6a09d2

Commits on Sep 30, 2020

• Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming

  chuntaojun

  committed
  c442a71

• feat: merge upstream develop

  chuntaojun

  committed
  8ad399a

• fix: fix merge conflict

  chuntaojun

  committed
  4987276

Commits on Oct 6, 2020

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  04fcbeb

Commits on Oct 11, 2020

• refactor: merge upstream jraft-naming

  chuntaojun

  committed
  3c8b841

Commits on Oct 12, 2020

• Move remove listener logic to ServiceManager

  KomachiSion

  committed
  b8b1113

• Move remove listener logic to ServiceManager

  KomachiSion

  committed
  b3b6c30

Commits on Oct 13, 2020

• Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming

  chuntaojun

  committed
  686ff8d

• Merge branch 'jraft-naming' of https://github.com/KomachiSion/nacos into jraft_naming

  chuntaojun

  committed
  73a29eb

• Merge branch 'develop' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  ff9f318

Commits on Oct 14, 2020

• refactor: code refactor

  chuntaojun

  committed
  b4e9950

• Naming module Raft protocol migration (#3989)

  Show description for 8a54b1f
  

  16 peopleauthored
  8a54b1f

Commits on Oct 15, 2020

• merge

  chuntaojun

  committed
  f60402c

• Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming

  chuntaojun

  committed
  fbeab52

Commits on Oct 20, 2020

• Merge branch 'jraft_naming' of https://github.com/alibaba/nacos into jraft_naming

  chuntaojun

  committed
  fd3ab9d

• Merge branch 'jraft_naming' of https://github.com/chuntaojun/nacos into jraft_naming

  chuntaojun

  committed
  13f65ed

• Merge pull request #4023 from chuntaojun/jraft_naming

  Show description for b246668
  KomachiSion

  authored
  b246668

• Revert "Naming module Raft protocol migration"

  KomachiSion

  authored
  525f981

• Merge pull request #4024 from alibaba/revert-4023-jraft_naming

  Show description for 4ee7626
  KomachiSion

  authored
  4ee7626

• Modify the startup script custom configuration first default configuration (#4021)

  Gitwangpin

  authored
  acc865d

Commits on Oct 21, 2020

• Merge branch 'jraft_naming' into jraft_naming_fix_commit_log

  Show description for 5d068a9
  KomachiSion

  committed
  5d068a9

• For checkStyle

  KomachiSion

  committed
  cf607a4

• Fix unit test error in ci

  KomachiSion

  committed
  7ad9644

• Fix integration test error

  KomachiSion

  committed
  fc33fb2

• Merge pull request #4034 from alibaba/jraft_naming_fix_commit_log

  Show description for 9ecc17e
  KomachiSion

  authored
  9ecc17e