Code

fix pd and tikv concurrent update#234

Code

Merged

xiaojingchen merged 8 commits intopingcap:masterpingcap/tidb-operator:masterfrom xiaojingchen:fix-upgrade-bugxiaojingchen/tidb-operator:fix-upgrade-bugCopy head branch name to clipboardDec 24, 2018

+53-2

Commits

Commits on Dec 17, 2018

• fix pd and tikv upgrading at same time

  xiaojingchen

  committed
  68e29ff

  Copy full SHA for 68e29ff

• Merge branch 'master' into fix-upgrade-bug

  xiaojingchen

  committed
  e98dcba

  Copy full SHA for e98dcba

Commits on Dec 21, 2018

• add unit test

  xiaojingchen

  committed
  7882e26

  Copy full SHA for 7882e26

• Merge branch 'master' into fix-upgrade-bug

  weekface

  authored
  4d1e0ec

  Copy full SHA for 4d1e0ec

Commits on Dec 22, 2018

• Merge branch 'master' into fix-upgrade-bug

  xiaojingchen

  authored
  f673335

  Copy full SHA for f673335

• Merge branch 'master' into fix-upgrade-bug

  xiaojingchen

  committed
  19db7a3

  Copy full SHA for 19db7a3

• Merge branch 'fix-upgrade-bug' of https://github.com/xiaojingchen/tidb-operator into fix-upgrade-bug

  xiaojingchen

  committed
  0ef4b83

  Copy full SHA for 0ef4b83

Commits on Dec 24, 2018

• Merge branch 'master' into fix-upgrade-bug

  xiaojingchen

  authored
  23615fb

  Copy full SHA for 23615fb