Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crosscheck, and fix all missing parameters, defaults, etc. #315

Closed
wants to merge 11 commits into from

Conversation

gclough
Copy link
Collaborator

@gclough gclough commented Mar 24, 2018

Fixed #314

Looking around, there seems to have been some missing parameters and defaults. I've crosschecked them, and updated the ones I found. I believe this is a complete verification. There are comments in #314 explaining what I did to verify this.

It looks like a lot of changes, but they are mostly repeats across several files.

Copy link
Contributor

@sebalix sebalix left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work @gclough

@sebalix
Copy link
Contributor

sebalix commented Mar 27, 2018

@gclough do not take it badly, but you should learn how to rebase your work (i.e. your PR branch) on top of master to avoid merge commits (which pollutes the history and make it harder to read/debug over time) :)

@gclough
Copy link
Collaborator Author

gclough commented Mar 27, 2018

@sebalix ... not a problem. I thought that merging in the master branch, and manually fixing any conflicts was the right thing to do. I'll have to do some more reading, as git is a bit new to me.

@sebalix
Copy link
Contributor

sebalix commented Mar 27, 2018

@gclough A merge has a strong semantic and it should be used to merge a work into a main branch (and so we keep the information that a feature/important change has been merged at a given date), but for keeping a development branch up-to-date with the main branch, rebase is the right tool to use.
I know git is not a simple tool and messing up a local repository is easy for a beginner (that's why I prefer Mercurial personally in some cases ;) ).
If you want some help to make a rebase on a PR, ping me, I could help you with that.

@gclough
Copy link
Collaborator Author

gclough commented Mar 27, 2018

@sebalix ... it's "rebased"... but I'm guessing I've cocked that up entirely. :o( How can I get in touch?

Greg Clough added 2 commits March 27, 2018 12:18
commit 971fc3c
Author: Greg Clough <[email protected]>
Date:   Tue Mar 27 12:01:10 2018 +0100

    Rebased from master

commit 5c6a5f0
Merge: 871edb6 c657d9d
Author: Greg Clough <[email protected]>
Date:   Tue Mar 27 12:00:08 2018 +0100

    Merge branch 'add_missing_conf_parameters' of https://github.com/gclough/postgresql into add_missing_conf_parameters

commit 871edb6
Author: Greg Clough <[email protected]>
Date:   Tue Mar 27 10:18:54 2018 +0100

    Changed variables to match the "double-quoted" string standard, as introduced in \ANXS#319

commit 2468343
Author: Greg Clough <[email protected]>
Date:   Mon Mar 26 16:53:31 2018 +0100

    Updated to use the standard "{{ var }}" format for new variables, rather than "{{var}}"

commit 68359af
Author: Greg Clough <[email protected]>
Date:   Sat Mar 24 15:30:30 2018 +0000

    Crosscheck, and fix all missing parameters, defaults, etc.

commit c657d9d
Author: Greg Clough <[email protected]>
Date:   Tue Mar 27 10:18:54 2018 +0100

    Changed variables to match the "double-quoted" string standard, as introduced in \ANXS#319

commit d009b72
Merge: 28b0e3a 28a6e9c
Author: Greg Clough <[email protected]>
Date:   Tue Mar 27 10:13:16 2018 +0100

    Merge branch 'master' of https://github.com/ANXS/postgresql into add_missing_conf_parameters

    Conflicts:
    	defaults/main.yml

commit 28b0e3a
Author: Greg Clough <[email protected]>
Date:   Mon Mar 26 16:53:31 2018 +0100

    Updated to use the standard "{{ var }}" format for new variables, rather than "{{var}}"

commit 28a6e9c
Merge: a1ab3cb 67e0fae
Author: Sergei Antipov <[email protected]>
Date:   Mon Mar 26 11:52:03 2018 -0400

    Merge pull request ANXS#319 from gclough/quote_all_enum_parameters

    Quote all string variables, and add spaces around variables "{{ var }}"

commit 67e0fae
Author: Greg Clough <[email protected]>
Date:   Mon Mar 26 12:23:19 2018 +0100

    Octal numbers need to be quoted, otherwise they get converted to Decimal

commit 42074a9
Author: Greg Clough <[email protected]>
Date:   Mon Mar 26 12:20:25 2018 +0100

    Crosschecked, and found some that I missed.

commit cb43081
Author: Greg Clough <[email protected]>
Date:   Mon Mar 26 11:48:01 2018 +0100

    Quote all string variables, and add spaces around variables "{{ var }}" instead of "{{var}""

commit b4f67e3
Author: Greg Clough <[email protected]>
Date:   Sat Mar 24 15:30:30 2018 +0000

    Crosscheck, and fix all missing parameters, defaults, etc.

commit a1ab3cb
Merge: 3861bc2 eabd1a0
Author: Sergei Antipov <[email protected]>
Date:   Fri Mar 23 12:46:42 2018 -0400

    Merge pull request ANXS#313 from gclough/fix_galaxy_centos_name

    Fixed CenOS/RedHat naming... should be EL

commit eabd1a0
Author: Greg Clough <[email protected]>
Date:   Fri Mar 23 15:27:39 2018 +0000

    Fixed CenOS/RedHat naming... should be EL.  Also added tags to help people find it on Galaxy

commit 3861bc2
Merge: 73c77b4 f584dbb
Author: Sergei Antipov <[email protected]>
Date:   Fri Mar 23 11:14:24 2018 -0400

    Merge pull request ANXS#312 from gclough/update_meta_for_centos_redhat

    Added meta data for CentOS and RedHat, plus added tags

commit f584dbb
Author: Greg Clough <[email protected]>
Date:   Fri Mar 23 14:35:52 2018 +0000

    Added meta data for CentOS and RedHat, plus added tags to help with searches

commit 73c77b4
Merge: 7346fdb a3f45f9
Author: Sergei Antipov <[email protected]>
Date:   Mon Mar 19 19:23:31 2018 -0400

    Merge pull request ANXS#307 from sebalix/use_postgresql_ext_for_extensions

    Use postgresql ext for extensions

commit a3f45f9
Author: Greg Clough <[email protected]>
Date:   Thu Mar 15 18:04:13 2018 +0000

    Added extra tests for travis to create extensions in "foobar" database

commit e918dbe
Author: Greg Clough <[email protected]>
Date:   Sat Mar 10 11:19:04 2018 +0000

    Convert from using "psql" to using the Ansible module "postgresql_ext", which I suspect
    is a more reliable method.
@sebalix
Copy link
Contributor

sebalix commented Mar 27, 2018

@gclough what commands did you go exactly?
As this PR already contains a merge commit, we have to delete it when performing the rebase.
I will try that locally and tell you how to fix this PR step by step.

@gclough
Copy link
Collaborator Author

gclough commented Mar 27, 2018

I tried this:

git checkout add_missing_conf_parameters
git rebase master
git rebase --continue
git status
git add defaults/main.yml
git rebase --continue
git commit -a
git push origin add_missing_conf_parameters

That gave me an error:

[ansible@localhost postgresql]$ git push origin add_missing_conf_parameters
Username for 'https://github.com': gclough
Password for 'https://[email protected]': 
To https://github.com/gclough/postgresql.git
 ! [rejected]        add_missing_conf_parameters -> add_missing_conf_parameters (non-fast-forward)
error: failed to push some refs to 'https://github.com/gclough/postgresql.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

So I tried

git pull upstream master
git commit -a
git push origin add_missing_conf_parameters

That still didn't work, so I tried to refresh my master branch:

git checkout master
git pull upstream master
git push origin master

Then I tried to rebase:

git checkout add_missing_conf_parameters 
git pull origin master
git rebase master
git add defaults/main.yml
git rebase --continue
git commit -a
git push origin add_missing_conf_parameters

Obviously I've screwed that up, so I'll to back to try and learn git. :-(

@sebalix
Copy link
Contributor

sebalix commented Mar 27, 2018

@gclough I sent you an email, did you get it (just to know)?

Copy link

This pr has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!

@github-actions github-actions bot added the stale label Apr 24, 2024
Copy link

This pr has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.

@github-actions github-actions bot closed this Jun 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

log_replication_commands parameter missing from v9.5, and v9.6
2 participants