2e296758e3
Removed unused msg param
2023-09-11 16:14:52 -07:00
d9353ea1a3
Cleanup
2023-09-11 15:52:51 -07:00
6f3beabf98
Attempt to perform merge of remote ref and tracking ref
2023-09-11 15:08:07 -07:00
7937a3f383
Merge branch 'zachmu/replication-force' of github.com:dolthub/dolt into zachmu/replication-force
2023-09-11 12:24:05 -07:00
1a0de31f7b
implement force pull
2023-09-11 12:20:21 -07:00
9f5c74ff9c
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-09-11 17:27:52 +00:00
d6c3aaee07
Merge branch 'zachmu/replication-force' of github.com:dolthub/dolt into zachmu/replication-force
2023-09-11 10:16:24 -07:00
e02a9efd02
Revert variable to global scope, fix tests
2023-09-11 10:16:20 -07:00
2720246d65
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-09-09 01:27:04 +00:00
be5a44ffa9
dead code
2023-09-08 18:15:06 -07:00
722a454b75
Server test for persisting variables
2023-09-08 18:13:34 -07:00
1216488006
Bug fixes for type of sys var, persisting bools
2023-09-08 17:50:14 -07:00
6c16c58d98
updated bats
2023-09-08 17:49:50 -07:00
cf5516a4ca
Merge pull request #6631 from dolthub/aaron/sqle-async-replication-do-not-repeatedly-push-deleted-branches
...
go: sqle: async replication: Fix a bug in the logic which decides what to push to stop pushing deleted branches after we push them once.
2023-09-08 08:20:11 -07:00
ec1df795f7
go: doltdb: commit_hooks: Add a test to assert we do not push deleted branches too many times in async push on write hook.
2023-09-07 15:55:26 -07:00
89149e7d90
go: sqle: async replication: Fix a bug in the logic which decides what to push to stop pushing deleted branches after we push them once.
2023-09-07 14:51:36 -07:00
00d2d636c4
Merge pull request #6623 from dolthub/max-hoffman-ee737803
...
[auto-bump] [no-release-notes] dependency by max-hoffman
2023-09-07 09:36:37 -07:00
f8e8d540cc
Merge pull request #6621 from dolthub/steph/profile-fix
...
fixes profiles not working with multiple profiles added
2023-09-07 09:18:31 -07:00
fb31c73840
Merge pull request #6622 from dolthub/steph/log-no-repo
...
allows dolt log outside dolt repos
2023-09-07 09:18:20 -07:00
132727f3f7
[ga-bump-dep] Bump dependency in Dolt by max-hoffman
2023-09-06 23:56:11 +00:00
d46aa37803
allows dolt log outside dolt repos
2023-09-06 16:45:52 -07:00
924b56a7fe
consolidate add profile code paths
2023-09-06 16:43:02 -07:00
8de06019b3
make multiple profiles work
2023-09-06 16:22:21 -07:00
d3c1ca4828
[no-release-notes] sysbench harness edits ( #6605 )
...
* [no-release-notes] sysbench harness edits
* fix yaml formatting
2023-09-06 14:10:04 -07:00
88e75974a3
[ga-bump-release] Update Dolt version to 1.14.0 and release v1.14.0
2023-09-06 17:54:55 +00:00
0ea2539dcd
Merge pull request #6619 from dolthub/fulghum/bugfix
...
Temporarily restrict `dolt_conflicts_resolve()` from resolving schema conflicts
2023-09-05 17:15:00 -07:00
9e914e0262
Adding skips for BATS schema-conflict tests
2023-09-05 15:48:22 -07:00
ba31bd096b
Temporarily restricting use of dolt_conflicts_resolve() until we fix the workflow around merging data after schema conflicts have been resolved. For more details, see: https://github.com/dolthub/dolt/issues/6616
2023-09-05 15:02:47 -07:00
51d30f7d31
Merge pull request #6607 from dolthub/aaron/dolt-clustering-standby-is-read-only
...
sqle: cluster: Set the engine to read-only when a replica is in standby mode. Set it back to read-write when it becomes primary.
2023-09-01 14:05:15 -07:00
a7bdff5882
[ga-bump-release] Update Dolt version to 1.13.6 and release v1.13.6
2023-09-01 18:35:33 +00:00
4e353182a7
[ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
2023-09-01 17:58:15 +00:00
8021bc5f02
sqle: cluster: Set the engine to read-only when a replica is in standby mode. Set it back to read-write when it becomes primary.
...
This prevents standby replicas from running some DDL which they were previously
erroneously allowed to run, including CREATE USER, GRANT, CREATE DATABASE and
DROP DATABASE.
2023-09-01 10:47:23 -07:00
9fc237dfa5
Merge pull request #6604 from dolthub/nicktobey-87fce68a
...
[auto-bump] [no-release-notes] dependency by nicktobey
2023-08-31 15:54:22 -07:00
c8058e9f40
[ga-bump-dep] Bump dependency in Dolt by nicktobey
2023-08-31 17:08:54 +00:00
f2a954775d
Merge pull request #6602 from dolthub/fulghum-896a98be
...
[auto-bump] [no-release-notes] dependency by fulghum
2023-08-30 14:41:43 -07:00
3c04a7dc30
Merge pull request #6600 from dolthub/steph/log-argparser
...
Separate out log arg parsers
2023-08-30 14:40:42 -07:00
765bb83727
consolidate log arg parsers
2023-08-30 13:08:24 -07:00
3c2660d5db
[ga-bump-dep] Bump dependency in Dolt by fulghum
2023-08-30 20:08:04 +00:00
0e29d45b5f
Merge pull request #6598 from dolthub/fulghum/dolt-6528
...
Move storage format version to only be displayed with `dolt version --verbose`
2023-08-30 11:40:39 -07:00
b3778c1662
create separate dolt_log arg parser
2023-08-30 10:42:45 -07:00
ea4d7fd356
Making arg descriptions more consistent, and adding a test that asserts storage format is not displayed by default
2023-08-30 10:16:08 -07:00
7f72d97a69
Merge pull request #6599 from dolthub/dependabot/go_modules/integration-tests/transactions/gopkg.in/yaml.v3-3.0.0
...
Bump gopkg.in/yaml.v3 from 3.0.0-20200313102051-9f266ea9e77c to 3.0.0 in /integration-tests/transactions
2023-08-30 10:13:45 -07:00
e8452fd744
Bump gopkg.in/yaml.v3 in /integration-tests/transactions
...
Bumps gopkg.in/yaml.v3 from 3.0.0-20200313102051-9f266ea9e77c to 3.0.0.
---
updated-dependencies:
- dependency-name: gopkg.in/yaml.v3
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com >
2023-08-30 13:56:40 +00:00
0dd50d9b7a
Merge pull request #6568 from dolthub/steph/dolt-log
...
updates `dolt log` to use sql backend
2023-08-29 16:51:34 -07:00
f2906b93e4
[ga-bump-release] Update Dolt version to 1.13.5 and release v1.13.5
2023-08-29 23:49:35 +00:00
7b31220ba7
Merge pull request #6517 from dolthub/fulghum/schema-merge
...
Automatically merge schema changes that widen `VARCHAR` fields to `TEXT`
2023-08-29 16:40:10 -07:00
7eac08c1a3
Merge pull request #6597 from dolthub/max-hoffman-664f4c6c
...
[auto-bump] [no-release-notes] dependency by max-hoffman
2023-08-29 15:45:15 -07:00
4c09863f14
Moving storage format info to only be displayed when a new --verbose/-v flag is specified
2023-08-29 15:41:03 -07:00
cdae367bd6
Merge pull request #6595 from dolthub/fulghum/dolt-6486
...
Feature: Allow `*` wildcard in `@@dolt_replicate_heads`
2023-08-29 15:20:05 -07:00
133c88b456
Bug fix and adding new test cases for TINYTEXT -> VARCHAR(300) conversion
2023-08-29 15:05:29 -07:00
Zach Musgrave